Revert "Revert "player and optimization update""

This reverts commit 80d10e7f71c581432dffb064acc05e9c618cec88.