Some solitions added; got rid of ARGF