-- removed combinediff
-- optimised imports