added some const keywords