v7+ level improvements
v7+ level improvements