updated to work with 6.0.1 had to force some unwrapping