refactoring -> brought back cellSrv