intigrated Alok's changes to img tokens