added some legacy stuff