Blocks Refactored as well.