adding additional components for GNFA's (also state compenent), but may remove later;
need to fully retest, its been a while since I last looked at this