added level1 fixes