Some more info, reorganization