move things to make more sense