update to r18