By the book, yes. But I have kept the signature similar to the previous implementation.