modification to enable callback in all activities