continue grid refactor