Made some changes
MORE