Justin Upton/Contract restructure