Improve macro farther