Updates to init function