Refactoring
Add RAW gesture