This is from the merge, Jeffery wrote this code, it just came into my branch from master