mostly final changes at 800pm