Hopefully finalized, pending approval from Sam