Latest version

Latest update from the morning meeting on April 22