feedback and suggestions from Nathan