Yes, this is much cleaner!