Taking cloning code off temporarely, so Alexandros can test