reordered a couple of methods