v3.8 Level 2 additions && Level 1 bugs fixed