Big Upgrade on activities !