Fixed up for publishing