Added Snaps impovement