? Consider adding comments for this handler like you have done for the others