Update language, move things around