Working on prepareDeltas fix