Level 2 reworked