Additional changes to master to initialize properly