3rd version

bug fixes