I'll fix the other methods in a separate pull request.