Some wierd highlighting issues, removed highlighting