finished the use case optimizations