Switched expiring and actual units
managing creation of expiring units