First draft of Close()