Changes for alignment