Re-align based on critique by Charis