Small modifications to alignment procedure