I didn't like this so I fixed it