Modified InputReader.scala