Revising marshalling