Almost ready to re-enable the recoding functionality