adjusted some stuff for responsiveness