Evan helped fix up code