Removed generification
Fixed cloning