updated with ZGA
zga totes works
added common sub & rm state mod