oo-approach expanded, disco-area finished