added options
removed link overwriting