Level 2 updates + fixed bug