pete made it work with new changes
merged merges merge