Made some changes , Test