added color and new structure