extended code for akademia2 scenario