Responsive changes
Completing merge