extra security for the optimization + a new one