re-implemented madison customizations that got lost in the sync