updated data and colors