UpAd and UpAll refactoring