final commit, minor fix