Too late, just got a refurbished 2015 model instead. Looks like a step in the right direction, but quite how Apple justify those prices for the hard drive upgrades is beyond me!