Updating to allow setting the fill color