refactoring inputs
refactoring links