fixed up a little bit