so I had some style changes along the way