updated to support by activity