added cloning to container - not very nice