Updated Core

Updated Core