Improved Auto[GS]Click version 2.0 - MPGH