Merge code from original repo