added macro routing