2nd attempt final changes