Updated to latest at 9:36pm June 18