add comments to handler functions