Fixed up, new code