changed FileParser