Update with Latest method of initialization