diezguerra new code, some changes