Converted more examples away from unwrap