16-17 juni changes, plots :D