Refactor part 1
fixed inputs