restructuring
added gat240 back in