I literally did the visa extension and re-entry permit today. It’s best to book the re-entry online to save time. I wasn’t able to book and the wait was quite a while. Just make sure you have all the correct paperwork. This is where you can book online