Merged Phu's changes