Davidtran99
Improve follow-up handling
3251b14