This change does not seem right...should the method take two parameters instead?