Added flag to control for alignment collapsing option