Added colors and comments