should be more responsive now