rework of getAll()