Block fixes

Why this entire change, moving the plugin call to later on? I believe the plugin should get the raw data.