tried to make more responsive