final commit to this branch from Alex