performance overhaul - activity table