changes for F18