updated 8.18