Big update on core