minor changes, more color matching