Further improve input