Updated some more

Updated after the meating from 18 May