Switched tree to make use of unwrap