Updated with other pull requests