S68970 more changes