link duplication reduced, var and file names modified