change according to David's comments