Moved to using John's solution code, now it wins
Data update