much cleaner revision