Last changes for thesis project.