lots of edits after meeting with shaun