todo and sample updated