Feature/fix big bang kernel