Fixed up for first pass