fixed code from the merge, repo is good.