Improved Tap, pending testing (full election)