Partial final commit