implemented block version
mergefix