update to more responsive