did this to get richard's
fixed merging problems