more work on core