Borrow and Popup changed