fixed all 6