Undid delete of findAll, but simplified.