Indianna Level 2 : Fixing regressions