greg final changes