Updated words, refactorised lol