Final version

I didn't sync the A-number removal, as Eric is working on it.