My sub highlight #1295

Josh pulled out in another PR