Generally on target, but I consider the extensions to be years of team control, with the added bonus of not being locked in. So to see Polanco as team control for 6.5 years makes it hard not to bump him up to the top. It’s hard to argue against having a pitcher of Berrios’ caliber at the top, but I think I’d at least swap Polanco and Buxton. On the option side, since Cruz is really team control for 1.5 years, I’d probably move him up some. But as you note, it really depends on context — the Royals looking at this list would order it quite a bit differently than the Astros.