Changed from file from DataInputStream to BufferedReader