Updated macranger