- Added old changes for old implementation.