keep in sync with corestar