Bug fixing
Added overwrite flag