Added refresh and deregister - do they work?