Updated few values
Lots of changes