3 Commits (fix/nickname)