#26 cs fixes p1