updates to 3.18