Level9 refactored