Changes

Some changes