Latest version with QA and alignment fixes