GA fix and improvement