Separated core to tray and issue