sort out a bit