Modified for paper publication