WIP merge with the new bones version