add closures.
resolve the conflict