First set of changes

General changes