Change to have the same method bodies