final changes.. hopefully..