Finalized update 9/18