Client 0.5

Modified client for 0.5