added some defers