Borrow from 7.1 wow!!!