The Envelope System 2.0: The Best of Both Worlds