modified for ga code