made improvements based on Jesse's comments on 8/23