Revert "Revert "Optimized render and collision""

This reverts commit d210070c68a0664fe23929fdd5ffcbf116c24863.