fixes this up a little more