Need to review changes, some are probably reverting new changes. I don't know why my last 2 commits were not merged
