improve inputs generating