Move input functions and add an address