Make it fit
Promote more operational links