David's changes