much cleaner this way...