fixed up a bit