Modified the constructor