more robot changes
Fixed conflict