more changes for tbms current location