Good idea - much cleaner!