Update for version 7.18