added command-line arguments to provide controller choice