changing things around a bit