Changes before presentation 04/08