Simplified the macro function