Added "macro" ability