Improvment on CellWorker