rearrange a couple of methods