Lot of changes

Don't Ask:-) But going in right direction