Added functions for non-eo clover+tm including block version