More Fixed/Adjustments to activities system