Made some changes

Latest version