Improved console input again