New changes from Brad. Fixing up code to work with changes