updates - before 24/06