Grammatical changes and correct 'rest end'