Multiple changes, including client for gui