moving things around a bit based on Mikes feedback