Probably cleaner this way