added highlighting and better stuffs