improved input ;-)