level2 + fixes