Big change, rewrite the logic according to the talk with Paul.