Attempting to make it more responsive.