10/31/14 - updated some code