final commit by jay on april 8