Pushing up fixed code from original repo