Fixed up Jay