New modification uselss, back to safe version