move things around a bit to make it flow better