Intergenerational and intra-generational equity