updated with dependency on core