proper structure now