added in fill color changes