fixing up the thing