fixed this one up a bit