Done, and it's much cleaner.