Modified to aktual Core Rev.