added Expert Mode