Merge with carter's and paul's files