more lifetime tracking stuff
try to fix merge