This should be more responsive now