added Snap Once and some enhancements