Converted macro to white-box macro
Better return statent feedback