final changes pls