Updating to the new location.
Updating macro stat to work in the new design.