PR Changes, fix local switching.