Refactor levels 8,9