Commited final changes to OldClone