new attempt to fix inter-activity sync issues