reduced cores and added some time checks