it's much cleaner like this ...