- Use macro here
- Added macro for trailling command
- Fix conflict