merged marco stuff