This is a huge change, to allow for cleanup