Question Mark: Improvement in optimization system

Improvement in optimization system for better game functioning.