Facebook’s popular messaging app WhatsApp is today adding support for GIFs to its iPhone app, allowing its billion users to search for customize and send animated GIF images in chats (Android support is still in beta and coming soon).

The updated app has a built-in search function for GIFs, pulling them in from third-party services Giphy and Tenor, and it also allows users to customize the images by adding captions, emojis or drawings on top of them. Alternatively users can upload a video to create an animated GIF, as long as the video is six seconds or shorter before uploading (otherwise you’ll have to trim the videos yourself elsewhere before uploading). And it also works with Apple’s Live Photos feature:

Send Live Photos as animated GIFs. Just 3D Touch any live photo from Attach — Photo/Video Library and choose “Select as GIF.”

You can access the GIF search function by tapping the “+” button, selecting Photo & Video Library, and tapping the “GIF” option. The images can be sent in both 1:1 and group chats. When uploading a video, you’ll now see a new “GIF” toggle.

The updated WhatsApp iPhone app, version 2.16.16, is available from the App Store now.

What’s New in Version 2.16.16

• Search for the perfect animated GIF right from within WhatsApp. Just tap Attach — Photo/Video Library and tap on the GIF search button on the bottom left to get started. • You can now send and receive animated GIFs • For videos that are 6 seconds or shorter, you can now send them as animated GIFs. Just tap the GIF toggle after picking a video. (requires iPhone 6s or iPhone 7) • Send Live Photos as animated GIFs. Just 3D Touch any live photo from Attach — Photo/Video Library and choose “Select as GIF.”