Addition of GA + bug fix