Modified to be more responsive.