further final changes