some edits from Mike