rebuilt with @GPXCAT added!