Bringing into full synch with josh version