merge David's changes