moved activity_id to activityid