add log and fix federation