Initial commit with a macro added