added code from cathy's local machine