Rename for release
Allow 1 or 2 parameters