Fiddled
Fixed type problems