added color fill back in