BUG: Reverted accidental changes, fixed all_info logic