using unwrap method instead

reverting back all the changes made and using the unwrap method instead.