Also updating the new __x() function