add fap and fix snap