cleaned up responsiveness