New recording API
Solved merge conflicts