final changes for ex4