v4.0 level 3 additions && deep cleanup previous levels