Change-Id: Ic931629bf0f7115196462f56f223aa7b94f57e44
Initialization
Made a few changes