Commit before Charlie's suggestions