Added distance(), removed Material