added code from weds april 2nd