Core update encore
core udate encore part 2