made a few changes but otherwise stuck