updated arguments as per #38