Adding few changes