Performance improved. Alignment refactored.