Implemented changes according to 4/16/13 meeting