removed need for separate client trigger