Rewrite to method

Rerote to methode
Batch fixes
Batch fix