small changes to expiry etc