Changes to client-side codes