WIP: cellnav speed improvement