Update for 918