Might as well do it properly