v3.7 -> Bugs fixed and level_2 modified