restruct to simply and added snaps