fixed: routing + added new flag