Modified to include syntax color highlighting