more polish at david's direction. things are getting messy