Made more responsive changes