merging lisa changes, raphael for stimuli, etc