Done. Also fixed argument bug.