Added arguments and a bit of statistics