Many changes comments next updated still