Fixed up and tweaked