Now uses scanner for input