rename variables
added M2