Did some changes to fix align.