Change to implementation to make use of keyword arguments