restrict-sub-tp done. hooray