Enhanced some Mathematics