updated with new syntax highlighting