Recurring done and fine tuned
Recurring conflict resolved