Made more responsive