Modified to include Syntax coloring