added client code and timestamps