Modernize, integrate change, switch to tap