Adjusted code for akademia2 scenario