updated by Ron Mourant to support 6.1