Some basic, incomplete changes