a little rearraging