Fixed up a bit more