Add /ua tp, organize permissions