Changed phone number to not be optional -- will roll back later