aiena/dev: links for fixing