Updated few changes