I changed and inserted GA logic.
Merged rfrost