max's changes to merge
merge fix