Revamp the align-to functions