updates according to CA's notes, result looks reasonable