added to proper structure