Some changes to try and add highlighting