Change to shorter lifetime