brendan makes weird changes
merges