final changes.. I think