Final changes 12 april