Start of improved code input via options.