Readded client code