Added delta-time
Optimization