merging Patrick's closed stuff