Minor Changes to Constructor