Changed to BufferedReader