Fixed up, simplified