added some upgrades to accomodate the new permissions stuff