Added all Amirs changes