Updated changes to initialization function