Added macro? function