UPDATE: highlight code to be more robust