many edits by florian, amy and joe