changes in structure and new options