Multi input improvements