6a final commit