cleared branch and copied from deanna's