Updated for ecegrid