Added KBO parameters, got rid of template nonsesne