changed to be more responsive