small changes to 36, newly started 37 and 38