Merging with yhoonkim project