Re-added comments to be able to transfer them.