nikita's changes to alignment