Updated comments to be useable