DJR:Comes up correctly now