Refactoring…Made responsive