You're very fortunate your friend can map. I can do the mechanical work myself, but nowadays as nobody is really interested mapping them. Collins is pretty close to me, but I can't imagine that being very cheap.

I assume you're still running all the standard inlet and imrc?