oo-approach expanded, disco-area nearly finished