WIP multiple oldInstances
WIP also add newInstance to oldInstances for more checks
WIP refactor