switch client code to common action  handler