Huge changes. After final presentation