Updates to align