adapt to cores and jski changes