final testing changes