[WIP] Issue/1669

Only required to keep track of the difference