Merge "Updated according to Chris comment Minor updates to the structure"