Finished swap and auto-complete