Updated to support swipes