updating based on jn's comments