More AMBUR changes