The rest of the changes to make it work