final changes. I swear..