fixed all 7