Revamp based on ual-third-party