added some work for the "tenancy"