Change functionality to more closely mirror old functionality