Replaced android client to simple client