Removed intermediary flatten container (for now)