Changes

Lot's of changes