Updated core code. Added yo