Fix top-level with new amplifier