final changes for updated version