Close #1 and #3