still need to fix close