More alignment work