Changes to initialization