Made todo sample working again