20140823 - more changes to get the flow going