Improved input