Working Changes

In progress