move it in so I can make it log better, substruct friendly