Improved direct entry.