add a couple of functions back