Add functions back in