pulling in minor changes