final changes, polish