MAP: sector rework, some new gates