Multiple changes as per merideth's request