I don't consider this something that necessarily needs to change (it's roughly the same code as before), just want to get an idea of where our limitations are.