unfinished update to 3.8.0