Public safety law should go into effect in July