changed structure
chaged structure