updated from Master 1-15-13