Updates by abrahsaz