final changes 04 april