Updated with syntax highlighting