final changes (hopefully)