Attempt to implement diff