added #_color_ matching and removed unneeded stuff