add code to support no cell expansion