fix it up a little more