chaning things around a bit