Changed to Brian's starting code