expandign core constructor
merge fix, everything else