mopup-manager revamp