some stupid final changes