Additional work on core tech