New changes - Debugging integration changes with josh's code