Merge jeff's files