Adjusted set up and zone in logic