Updated server/client/mainactivity