Natural stimulus manual merge
natural stimulus works now