Should I move this after the expireGenericCommand to keep the expiry as true as possible?