Revert Track system core for test :/