Updated Open/Close procedures