Modi, Shah: Vajpayee, Advani 2.0