starting to fix close