Add new Next cop
Adapt code to fulfill new Next cop