Updating comments
Updating to on-disk version