enhanced ui and tor