Updated for syntax highlighting