Changes

1st set of changes