The almost perfect solar calendar: part two