fixed da bug and metrics update