all latest updates, should be final