added tapblock changes