Moving to 3.5.2 and making  rely on  and not