updated cell mapper