Pulled in more changes