Updated with emoji logic