Responsive refactor - 1hr