Further optimizations to handling moving sectors