Added activity calculations