Reordered arguments, added defaults