Updating: more on changing $ to __