Add level 2 (temporary) , fix some code.