made client code less stupid