All the changes to make the C6 version awesome