The final version of the edis thesis project