Merge changes from @stuntguy3000