snapshot sec 4, 5, and restructure