fixed up, wasn't really sure about this to start with :)