GKFlax - Made some improvements