Final Core Changes