Updated to allow non-closeability