Core logic upgraded to latest spec