Many changes in this versions