Added internal recorder