Added argument check.
Added extra name argument.