more stuff to tfsmaster