Architecture Update, June 2018