Updated self close