Fixed up for submission