fixed all 2