much cleaner now