Optimization
Add responsiveness