Updated for Right-to-Left support