2.0  added code for tbplus compatibility