fabian/prod: links for wait