Final modifications to get DOT file working