Working on finishing the new recoding