fix up a little bit more