Reworking some of the language