Includes adjustments to improve responsiveness