Modified the Social-constructor