edited 3/1 solution