make add_activity optional