David's final modifications