More changes to cope with verse 0