Option .get() changed to .unwrap() to avoid copy