Make more responsive