Take care of the smileys [UPDATED]