final multi-gate changes