added some tbd code