Change comments to echo