latest changes for alignment and the like
latest changes