Made little more responsive