Added alignment selector, possible optimization. To be tested