including edits by Alex