Somehow my MacBook Pro still had AppleCare, so I got a new battery. Also checked out the Retina 15-inch. Looks even better than I expected.