2nd final changes