Revised function arguments.

Made arguments optional with generic defaults.