David's simple changes