Closed #1, #2