change the way expire is set