Lvl 2 changes

not finished yet