Highlight commands closes #3