improve GridSystem !