Merged with John's

Pull Request Manually Done