Started adding close func