Feature/cop

ok, and I see you fixed the other calls below. Thx!