Refactored Responsiveness