Reviewed David's changes