Updtated comments to fit the new architecture