Updated code; review Wednesday