as_tuple reorganization
updates