Tried something I didn't like, small changes.