merge paul's stuff