Changed construct function
Changed construct function