Fixes to adapt to new function signatures
Functions to run on dataset with a window size of 2