Soem changes to client and main activity