changed API names (marshall -> marshal, seems this is correct)