Updated comments to keep the development up-to-date