Added David's changes