final changes have been added