added block helper support and removed current and onDelete stuff
merged