Hopefully can remove all the GUARD flags and redo with dg scripts?