Working day 3
Switched to use yield instead of block.