[WIP] Issue/1669

:construction: Only required to keep track of the difference