merging joe and drea's code