Merging phu's work