Temp fix to level 6 and 7