Re-added main